Skip to content

Fix bug discovered due to the change in implicit-str-concat#12378

Merged
webknjaz merged 2 commits intopytest-dev:mainfrom
Pierre-Sassoulas:fix-implicit-str-concat-and-discovered-bug-due-to-it
Mar 10, 2026
Merged

Fix bug discovered due to the change in implicit-str-concat#12378
webknjaz merged 2 commits intopytest-dev:mainfrom
Pierre-Sassoulas:fix-implicit-str-concat-and-discovered-bug-due-to-it

Conversation

@Pierre-Sassoulas
Copy link
Member

@Pierre-Sassoulas Pierre-Sassoulas commented May 27, 2024

Follow-up to #12172 (comment). I must confess I just followed suggestion blindly and don't understand much 😄 Need to retro-engineer a little to understand what's happening.

@Pierre-Sassoulas Pierre-Sassoulas added type: bug problem that needs to be addressed needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch labels May 27, 2024
@Pierre-Sassoulas Pierre-Sassoulas changed the title Fix implicit-str-concat and bug discovered due to the change Fix bug discovered due to the change in implicit-str-concat May 27, 2024
@Pierre-Sassoulas Pierre-Sassoulas marked this pull request as draft May 27, 2024 21:39
@Pierre-Sassoulas Pierre-Sassoulas force-pushed the fix-implicit-str-concat-and-discovered-bug-due-to-it branch from 398df71 to 5f1f3aa Compare May 29, 2024 13:33
@Pierre-Sassoulas Pierre-Sassoulas force-pushed the fix-implicit-str-concat-and-discovered-bug-due-to-it branch 2 times, most recently from e744a14 to a5f5100 Compare January 11, 2025 07:43
@Pierre-Sassoulas Pierre-Sassoulas added the skip news used on prs to opt out of the changelog requirement label Jan 11, 2025
@webknjaz webknjaz added the backport 9.0.x apply to PRs at any point; backports the changes to the 9.0.x branch label Feb 11, 2026
@Pierre-Sassoulas Pierre-Sassoulas force-pushed the fix-implicit-str-concat-and-discovered-bug-due-to-it branch from 5be48f4 to 75ef584 Compare February 12, 2026 12:27
@Pierre-Sassoulas Pierre-Sassoulas marked this pull request as ready for review February 12, 2026 12:28
@Pierre-Sassoulas
Copy link
Member Author

@webknjaz here's an easy 1 line review for you 😉

@webknjaz webknjaz enabled auto-merge March 10, 2026 20:01
@Pierre-Sassoulas
Copy link
Member Author

Thank you!

@webknjaz webknjaz merged commit 55560d9 into pytest-dev:main Mar 10, 2026
33 checks passed
@patchback
Copy link

patchback bot commented Mar 10, 2026

Backport to 9.0.x: 💚 backport PR created

✅ Backport PR branch: patchback/backports/9.0.x/55560d9d4187feecea18b1e637f43f55912d0303/pr-12378

Backported as #14282

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Mar 10, 2026
…at-and-discovered-bug-due-to-it

Fix bug discovered due to the change in  ``implicit-str-concat``

(cherry picked from commit 55560d9)
Pierre-Sassoulas pushed a commit that referenced this pull request Mar 11, 2026
…at-and-discovered-bug-due-to-it (#14282)

Fix bug discovered due to the change in  ``implicit-str-concat``

(cherry picked from commit 55560d9)

Co-authored-by: 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко) <webknjaz@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 9.0.x apply to PRs at any point; backports the changes to the 9.0.x branch needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch skip news used on prs to opt out of the changelog requirement type: bug problem that needs to be addressed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants